Merge branch 'fix/rich-media-ttl-fallback' into 'develop'