Add changes back
For some reason I was unable to merge the MR for branches (probably GitLab upgrade). I had to rebase master and somehow the changes were shown in the ticket but they were not in the source branch. This commit adds them back so we can merge them.