Merge topic '15104_fix_catalyst_writers'

8e56e935 BUG #15104: Fix writers exported in catalyst scripts.
Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I565013daf54d7c3afe13df43730093ff6043e334