LGTM
Merging...
However, should we have this line of code in the maintenance branche too?