Man, CE-1029? This is an old ticket!
Please review this MR before I add this to the rest of the repositories to make sure that it