First attempt to fix API widgets problem
Merge branch 'develop' [ci skip]