Wip 7169 2

updated fix and refactoring for 7169.