Merge branch 'develop'
Merge branch 'develop'
Update dist
Merge branch 'develop'
Update dist
:bug: Fix main button behavior in TA mode