Merge readlink branch