Bring resource processing into line with 2.x trunk