[#79754874] latest changes applied
Merge 79754874-latest-changes to master

[Completes #79754874]