Guards for View.
Improved logging.
Merge branch 'develop' into poc-6+