Maint/3.1.x/add f18 mocks to build defaults