Merge recent master changes into version2