Big requests conflict free

Just merged the current master (with compatibility changes) into your big-requests.