Sorry for the delay in reviewing this MR. I have a few comments, only one is "important", related some missing cleanup on an error path. The comment happens to be in a context area that needed to be expanded with the arrow, hopefully gitlab does the right thing...