Bug/adjust build tools version #5491