Merge branch 'ab/conditional-config-with-symlinks'