SWC-605: merging up to release-z from develop after re-evaluation of impact/risk