language integration ready
Merge remote-tracking branch 'origin/languaje-integration' into dev