* luci-0.8: merge r3607, r3608, r3611 and r3612