#3548

Ok, I have just resolved all issues, please recheck.