Merge "Fix conditional keep rules for new semantics"