Merged in the assertion-test branch/PR