Add PR #1851 from the framework