Catching up commits to 2.4.6 (was having git issues)