Merge "Bump models to a released version 2.1.5-SNAPSHOT" into elalto