Revert "Revert "New Changes to 2.5.5""

This reverts commit 3262331a2aabdc6014cf4bb6bd65f872fbbfd944.