adding missing options + fix build errors
Merge branch '2.3' into 2.4
Merge branch '2.4'