Merge "fix to work <select all> well" into 2.0_beta