Merge master to Feature/loading views

As mentioned in #815, this commit merges master with loading-view branch.
After merging these two here I'll create another pull request for style fix and failure handling.