Merge branch 'hotfix/userbarbug'
Merge branch 'release/1.24'
frank highlight
Merge branch 'hotfix/frankfeature' into develop