Merge branch 'rnou/354-better-symlink-rename-interactions' into 'master'

Resolve "Better Symlink / rename interactions"

Closes #354

Closes #354

See merge request !246