Revert "Revert "Merge remote-tracking branch 'origin/master' into roman""

This reverts commit 7731dac22db864b020511898cea5cc3a24deab7e.