fixed samples 36-37 for ui test
fixed sample35 for ui test
Merge branch 'samples-dev'