Merge "Move constants to MODULE_LIB"