Changes for SHDP-173