prevent bad access-error
Merge branch 'release/1.5.28'