included latest fixes from 71x branch
included latest fixes from 71x branch