Master
merge all changes from chang into gkobsik as intermediate stage before merging into master. Test lava-samples before merge into master.
merge all changes from chang into gkobsik as intermediate stage before merging into master. Test lava-samples before merge into master.