Manually merged PR323 : made the proposed behaviour conditional
Added content type tests