[Bleeding] Integrate pending changes. Resolves #2