MDL-39846 improve validation and enable hardcoding of system context