Merge branch 'dev' into FeedbackSessions
Fix test