New build based on revison 18640