Merge branch 'master' into pan_map