Merge branch 'gre-lwt-fixes'