Merge "SharedContext class DB constraints"