ERT-605 Refactor reading current run path