Adding content type to OLS response
Merge remote-tracking branch 'upstream/12I_CPO_TP' into 12I_CPO_TP_S2_kaso