Changes for the staging environment related flags