nponeccop Refactor - minor changes and move to lts-9.10