Reverting Bltoolkit back to version 2, cause version 4 seems to be buggy
Merge branch 'release/release-1' into develop