Merged HG pakcage branch