Issue #3483365 by das-peter: Change directory path replacement to use a less greedy implementation that replaces only the first occurrence