Merge "Tools: Update Model Selector"