submit code change for CLOUDSRV-4204 to branch 2.2.1