PDIO-283 Single machine MAP@k and its integration
Scalariform cleanup