Branch merge: stable

Bugs and features.