Addressed BUG 905659
logged changes