Merge "FunctionalMenuItem DB constraints fix"