I made a review for 8.5 in relation to this issue, commited in [86b6e7b98a8d1551] as branch [_clean_core_8_5]. The code is more similar to 8.6 now.

BTW. I have misleadingly commited a diff from my private branch, and because I don't know something like "commit -amend" or "delete branch", I have just closed my misleadingly commit (if someone knows how it can be deleted, then please do it).