Bugfixes brought from develop-bill.
Bug fixes -> release 1.5.1
Release 1.5.0 -> release 1.5.1
Merge branch 'release-1.5.1' into develop-bill