Resolve #3611105 "Sentinel fallback does"

Robin De Herdtrequested to merge
issue/altcha-3611105:3611105-sentinel-fallback-does into 1.0.x

Closes #3611105

Merge request reports