Merged in recent changes from master branch