Merge branch 'revert/tags-releases-develop' into 'develop'