Issue #3056409 by rkostov, larowlan, maximpodorov: BlockRepository::contextHandler is created dynamically (cherry picked from commit 0e61d218)