BZ-0000 refactoring minot changes
Merge remote-tracking branch 'refs/remotes/origin/noesispro_fd' into noesispro_fd