Merge branch 'master' into patch_functionality