Revert "Revert "Revert "New Changes to 2.5.5"""

This reverts commit 01b43cda748df6396485b19b39be072bd1826f65.