QAART-439 Fixes from CR. Encapsulation