D-14493 Pull request feedback