PLA-793  merge fix