Merge "Fixes building of automated tests" into devel/new_mesh