Feature 5084

modifying some code according to core features

Do not forget to checkout Core and Installer-package...