Bring up-to-date with LKF 0.4