This merge request fixes the two open issues pertaining to the build system having dependency tracking issues.
