Initial draft PR: #344
Initial draft PR: #344