Merge "Add standard options to readlink" into klp-dev