You're totally right about the templating stuff actually being in the client @AlexeyMK. Both is perfectly fine for me tbh. Should be click-mergeable again.