Merge branch 'develop' into log1m