Merge branch 'trunk' into HDDS-1880-Decom