* luci-0.8: merge r3703-r3706