[df-185] Chery pick
Merge branch 're_stable' of https://github.com/dava/dava.framework into re_stable