Thanks for merging #2556 now!

I don't think #3208 will be updated as it has no feedback stating that something *is* required to change for it to be accepted. Considering the to me passed, please just merge or reject it.