For proper ordering, master should be appended at the end
Merge branch 'smart_language' into nomadic