Merge remote-tracking branch 'eg-working/collab/berick/lp_888239_prevent_post-capture...