Merge branch 'start-with-iid-on-new-branch' into 'master'

Start with iid on branch creation

After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name.

See merge request !3708