#3169

Ok, I resolved all issues, please recheck.