Merge branch 'rc'
Merge branch 'master' into dev
Merge branch 'dev' into FeedbackSessions