Merge "Remove at_quick_exit call" into sc-dev