backport registration key fix to 4.1.0RC branch