merge dev

Reduce round trip time for single request