Merge branch 'km_sql_fixes' of gitlab.syncad.com:hive/HAfAH into km_sql_fixes (rebase on develop)