Ribbon item markup fix
Merge remote-tracking branch 'v2/feature/backend' into feature/backend