Signed-off-by: Virendra Kakade <virendra.kakade@ni.com> Original-commit: e7c2035df2ead4939a585e649675e895562cf917