Merge "Change the default value of the flag to true as discussed via chat" into main