Merge "Define some symlinks for workaround solutions"