unified 'country sites / nodes' to 'sites'
Merge branch 'stable'