merged changes for SWC-750