merge MASTER (1.12.10) changes into UAT