mitigate zero risk problems
Merge branch '2.x/develop' of github.com:sharpefolio/sharpefolio into 2.x/develop