Merge "Creates API for QS that avoids getHeader" into main