fork from OmniTI internal/common repo at 87bab60f