initial changes for story 79696750 - pending testing