I have uploaded master images with LuCI based on the patch above here.
@amteza Feel free to run with it. I was mostly curious to see if building on master here would break like you said, but I didn't see any glaring issues.