Merge branch develop, module version update