Merge remote-tracking branch 'upstream/feature/side-navigation' into …
58938a4
…feature/side-navigation
