Revert "Revert "[140401] Important update!""

This reverts commit 8b8eda45c1cde2f036f1cdfb276fd5896a241ce4.