ref: refs/heads/major/ADAPT-2285
