OJOPIPA-21672

OJOPIPA-21672