messages feedback from steven, web only
Merge branch 'master' into integration