Reddwarf backport

Backport original PR
Also backport PR fix to original PR