LPS-49294

I'll keep that in mind as a trick for any future situations like that - sorry for any extra effort that has to be put into this one. 

With regards to the merge - its a pretty big pull request and it tends to conflict with something if too many other commits are allowed to build up - I rebase and fix any conflicts whenever I can, and did just now, but because of the disjoing in the schedules I am not quite sure how to approach that problem.