Integrate all original bugfixes up to 1.18

[Pyrdacor]

All the bugfixes which were done up to release 1.18 of the original should be also integrated here.