Ajay/DC | #3629 | Bugfix - Tab not highlighted