Fix bug 4483/4440: selflink was disappearing in certain cases

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Merge branch 'QA_4_2'