Merge "Refactor selector step logic"