CB-K21/1238 Update 17