Merge branch 'bugfix/osada-mention' into 'develop'