trq-2206 Only half of one update got merged.