Merge "Fix ApexManager#snapshotCeData (3/n)"