block fix
Merge branch 'n_creator'
fixes from letter 4 and 4-1
deploy for test and prelast fixes
fix with tie nad mayka