Merge "remount: Add checkpoint instructions with warning"