Merge in updates from Aurora-SIm to make it match the latest master.