Merge branch 'redzero' into spsa (7934052)