merging from master to dev as a part of release activities for 0.8.7