New build based on revision 17849