Squash sidebar commits from ChaOS