One out of two PRs is merged now, I am going to close this task as all requested work was done on the remaining PR