* Resolved conflicts with Gustavo's commit
* Sync with gustavo
Revert "* Sync with gustavo"

This reverts commit f7f8727ce4191987bab05656cb5db20bbdf2c88e.
* Specified constants