UPD: #1225 for ContentBlockModule + small fix PSR