Merge "Correct the order of paramenters in grantInputChannel." into main