Ci-16255

Trace: Ci-16255