Merge "Handle code item overruns in cdex code item write"