Merge "New hook accommodates non-revision rc queries"