Merge pull request #228 from benavlabs/preparations-for-0-15-11

Merge pull request #228 from benavlabs/preparations-for-0-15-11 #694