Merged requests from lc3t35