Merge "Allowing base class for ResourceBasedOverride to have Context based constructors" into main