Adapt-21618

Adapt-21618