[lime-dev] branch develop cherry picked in lime-ng-config