Merge "Remove proxy logic from GetCodeItem"