Merge commit 'c15ed2d771b4b02bab5f2a2281d08a050ee1df89' * commit 'c15ed2d771b4b02bab5f2a2281d08a050ee1df89': Fix a double issue regarding interrupted builds due to pre-existing errors.
Merge commit 'c15ed2d771b4b02bab5f2a2281d08a050ee1df89' * commit 'c15ed2d771b4b02bab5f2a2281d08a050ee1df89': Fix a double issue regarding interrupted builds due to pre-existing errors.