Added the current uncommited changes to production code, and rebased to 4.6.8