Master versiontag

Same as #6007 but for master, I guess it should go in first and cherry pick the merge commit to Helix?