Merge remote-tracking branch 'origin/master' into bugs/415863-multiple_dispatch