new view
Merge branch 'release/1.12.2014'