Resolve all issues from n3554/n3554