Merge "Switch flags from mock to fake" into main