TRQ-1668 - issues found from regression tests.