Merge "Adding feature flag and replace existing boolean with settings check" into main