REVIEW comment about a log level that is probably inappropriate.
Merge branch 'develop' into ui/dev