Merge comments from master
Don't read directly from user profile
Adapt tests to code change