Merge branch 'pr-g-any' into 'develop'

fix: generated code imports

See merge request !339