new version 1.8.21
Merge branch '1.8.x' of github.com:pillarone/risk-analytics-application into 1.8.x