Merge "Change conditional keep rule syntax"