luci-0.9: merge r5590, r5591 and r5592