Update: samples
Merge branch 'development'