NXP-15409 aligned to hamcrest 1.3