CAAERS-7068, testing in dev commit.
CAAERS-7062, cleanup.
CAAERS-7068, final fix.