Merging master 0.2 changes into static 0.2 branch