Merge "Issue-ID: DOC-613 fixed problem with duplicate file names and wrong links"