Merge "moduleSetTag and cmhandle upgrade functionalities fix"