Pull req for staging for #1102 for Sprint 25