Merge "Fix bugs link"