Embargo3

This pull request is a revised version of DS-1360 which took in the comments to DS-1360.