Revert "Revert "BRANCH 4 updates.""

This reverts commit 045172ad41036c77d2ef4bebc418d75c4185389e.