Revert "Revert "Merge branch 'master' into Dylan-(replace""

This reverts commit 5462f5de8e66ddbbd425ac15173790f5729bc97d.