fix menubuilder bugs
added view variable provider name
Merge branch 'refs/heads/master' into 2.1