Default wait_for_binary_proto to true
Only wait for binary proto for 2 minutes
Merge branch 'master' into wait_for_binary_proto
Merge branch 'wait_for_binary_proto' into develop