back-ported changes to fuerte branch