Merge tag '1.0.1' into hsmaster_update