refs #655 - merge FB. few comments will be in a separate ticket