Integrating  master to dev as a part of Release 0.10.2