Subtree merged in Lib/Nonagon.Foundation
Merge changes from STM