Merge branch 'master' into map-execute