Merge "Add rule for toggling changes at test time"