Issue refs #1809: root issue fixed, rest some refactoring activities