Merge "PiP: Polish stashing physics." into sc-dev