tasks #1001, #42, #350