BZ-0000 baseline
Merge remote-tracking branch 'refs/remotes/origin/noesispro_fd' into noesispro_fd