merge changes from alfresco sdk