Merge branch 'fix/991-version-generation' into 'develop'