Revert "-Merge Master to Devnaroo"

This reverts commit 8d1afe92e0fe00ffc63b5dcfe46e9b77e2171216.
Revert "Revert "-Merge Master to Devnaroo""

This reverts commit eb90b23d30bac4621533d1e5c676881673df91b7.
Revert "Revert "Revert "-Merge Master to Devnaroo"""

This reverts commit 7fa1938ef3ae9dae149fa3668b746e66e05fd337.
Revert "Revert "Revert "Revert "-Merge Master to Devnaroo""""

This reverts commit 3ad38382de5dd3aa123a09235e2ba3c92ca59924.