NAP-19 #resolve this task is complete!