Merge "Fix forward for breakage related to resource permissions" into main