luci-0.9: merge r5022 and r5023