Merge "Try to avoid master queries for GET requests"