Merge from master

2 jobs for !247 with nested_query_issue83 in 29 minutes and 7 seconds (queued for 1 second)
latest merge request