revert 'aborted' change.
Merging origin/goliver/master-pending-revert-abort into master