clone from version 6.08-exp (04/04/13)