Merge "Modernise code to use std::make_unique"