Merge "Add flag for removing flag resets in RP" into main