Merge branch 'akoshevoy/path_mappers'