3.3.0 ci

Code contribution from the Conext project.