* Merge unstable branch: