Merge "Fix small issue in selection logic Test: Locally built & deployed"