fix bug where lazy loaded views are loaded multiple times
Merge branch 'lazy-load-multiple-parameters' into change-master