[Fix] views not in config
Merge branch '1.1' into 1.2