Integrating from master to Dev as a part of Release 0.8.13