BIC v3.1.19 && Forms v3.1.5
Merge branch 'release/v3.1.19' into develop