MDL-36445 Airnotifier, initial changes for the now workflow