Latest updates from hg-repo