Revert "Revert "P2 of ssw-567 commited""

This reverts commit 225f792e5492c9cbba8149bf9df0addfc3908d1e.