* luci-0.8: merge r3692, r3695 and r3699-r3702