fix basic sturcute types
Merge remote-tracking branch 'origin/2.1.2-26-Jan' into 2.1.2-26-Jan