Merge branch '1-stable' into 'stable'