New build based on revison 16490