Merge changes from topic 'asserts'