Resolve focus issue
Merge remote-tracking branch 'origin/standard-toggle' into develop