BugID: 97428, cache selector in a local variable
Merge branch 'BugId-97428' into dev