Merge branch 'develop' into fix/update-readme-and-logs