br2032 commit 

2150

Change-Id: I51530b2c5536f1f723a63c87745e35ce349b19ca
Merge branch 'master' of https://github.com/syosifov/str.git into br2032