COMP: clean branch rebased on top of pnlbwh/UKF master