bumped to version 4.15.4
Merge branch 'develop'