Revert "Revert changes in Master"

This reverts commit 77c6328d30a3952649d591782d14c9c5602bbc2a.