#2158 updated code to improve cmis performance