Dev upmerge after accepting PR

Dev upmerge after accepting PR.