Re-apply partially JB update 1