Catch up to ops-06 and smtp-12