Fix issue in build
Merge branch 'release/0.1.15'