Merge "Change in vnflcm"