Merge branch '6405-postfix_version' into 'develop'

Fix undefined $postfix_version and generalize code, #6405

Closes #6405

See merge request !1654
1 job for develop in 9 seconds (queued for 4 seconds)