Merge MASTER (1.8.0) into UAT