Revert "Merge master into test"

This reverts commit 157cefdfded5f325a5cd8bfd2f4868ed8b2eacff.