WIP Remaining work on 9271d2e731a

This commit completes commit 9271d2e731a6c14f7a123e37403550fabb143480