Merging changes from nmz787