key_commit: Fixed bugs relating to update v1.12
Merge branch 'dev' of barnabas.kellpro.net:kts into dev