Merge hg5fm changes into master branch