too many updates to count :)
Merge changes from upstream ESSENTIAL_26 (conflicts resolved)