Merge "Fix skip_path logic if path part is empty"