Merge "App class DB constraints"