Make overlay/activate job aware

Main code rev. 1955