THISTED-2 - CR fixes.