tos_revert_merge
master
This reverts commit d7aba8ad34. Rollback of last merge and recovering of internal links code
d7aba8ad34