The main problem was already fixed by Igor under terms of 16674. Adding some additional minor fixes and tests.
Attach a file by drag & drop or click to upload
