Merge changes I7fb673e0,Id2e377ba

* changes:
  CpuExecutor: reorder field designators
  Remove unused identifiers