Merge tag 'v2.5.1'

v2.5.1
Always bundle production branch of sample apps
v2.5.2
Merge branch 'release/2.5.2' into production