Merge "Do not use sa_restorer if not defined"