Added a quick hack to apply KC6 upgrade SQL/DML