Merge branch 'looks-like-a-synchronous-query' into playground