Merge "Align grant request with SOL003."