issue #20524: move and rename
issue #20524: fix paths
issue #20524: start on the client