Merge "Fix for a foreign key constraint fails"