Sync master changes back into dev 8.6.2

Sync master changes back into dev 8.6.2