Changes for ISSUE: 440