Adding version and environment information in comments
Merge branch 'develop' into dev-initial