Merge "Composer rendering optimization" into v1.1