Merge branch 'sprint_cordoba' into 'master'

[RELEASE] Sprint cordoba

See merge request e/apps/GmsCore!5
1 job for dev in 5 minutes