Additional comments from merge with feature branch

Additional automated comments added after merge of development with
feature branch. To be removed.