Merge trunk into HDDS-48