Fixes: U4-4430 MySql primary key issues