Merge "Clear auto select sub correctly" into 24D1-dev