Integrating from release to master as a part of Release 0.8.13