Merge branch 'hotfix/assert-true-macro'