Patch 3.18-P002

For further details please have a look at the readme-files of the patch.