Merge recent develop changes into version2