bug fix
Merge branch '12-variant-enhance' into 13