(cherry picked from commit 905e15d1ff417bd523bf8f595308c0a90fbb1036)
Co-authored-by: David Claybourne <claybourne.david@gmail.com>