DO NOT MERGE: platform-overrides-2