initial commit over 0.63, with robymus patch applied