Squash sidebar commits from ChaOS [1/2]