Merge branch 'topic/leto_path_class'