moved common to branch 'stable'