Apply fix from CMIS-658