Actually fixing #1050 this time ;)
Merge branch 'anurse-1050-pushnullref' into qa