Merge "Fix nullpointer exception in CompatConfig" into sc-dev