Eng 6534

review only - waiting for system tests.