[HK] Complete changeset for @rowanthorpe pull request #37