* luci-0.8: merge r3785 and r3786