Enhance sidebar states
Merge branch 'MH-780' into dev