Co-authored-by: Wade Fife <wade.fife@ni.com> Original-commit: 94b4de39d61ac4165ab18001b7d1a27c34698795