That sounds reasonable.
As you see I have already merged this one...