BC-988 use Soluvas Framework 2.1.0