master-update includes: #16762, #16700, #16473, #15985, #15397, #15066, #16016