Support of different content types cleaned

Fixes bug: #1197530

Change-Id: Ic4024eb2016310aae69dca4c9bb3726d8baf02bc
Merge "Support of different content types cleaned"