Squash merge from small-fixes