Merge from master (changes for v1.4.2 patch)