Merge branch 'feature/check-required-assert'