Merge "Capture MSKPs from RE more reliably" into sc-dev