Fix release branch configuration and compile errors
Fix configuration and compile errors introduced into release branch through back-patching from master.
Fix configuration and compile errors introduced into release branch through back-patching from master.