Make data explorer compatible to Catalyst writers

Change-Id: I60ff01f254d0646ec725fe86248c3554fec86821
Merge topic 'catalyst-web' into next

23fbe13 Make data explorer compatible to Catalyst writers