Merge "Adjust SF for Queens release"