Revert "Revert "Squashed commit of the following:""

This reverts commit 3125d99b3464b60768bc31b612f55b861c3ba23e.