OEL related changes
Merge branch 'hotfix' of github.com:vstaykov/testinggit into hf