add --2.1 flag
use branch instead of compilation flag for selecting compatibility mode, update #2233