contrib: Add contributions from Andrei Epure