CB-K21/1087 Update 8