Merge branch 'maint-0.4.1' into maint-0.4.2

`git merge --strategy ours` to use STATIC for unit tests in
maint-0.4.2.