Adding summary of discussion 4
Merge branch 'develop'