Merge "Bug fix on Engine Configurable" into mnc-dev