merging changes to sub-modules from 'develop'