Merge from master (v1.7.18)