DSSSM-272 Merging from testing into unstable