Issue 1618 - Updated buildtools