bg fixed
Merge branch 'developer/claralinos' into dev