Upstream changes: 1.00 15 Feb 2018 Grant McLean - Add makefile dependency to fix order of build steps RT#62289 (patch from Ed J)