First drafts to support LT-13911

Change-Id: Ibf9d141ca5af0cb75f8d8b3f331147f4902ee9e4
Retry push topics for LT-13911

Change-Id: Iddc623b618a3a7238fbbad51d1d1fc9810ea7ba4