Merge branch 'master' into bbox_interface