Merge branch 't/mood_fix'