SWC-650, SWC-654: merge changes from release-y down to develop