Merge "registration: Fix if or elseif constructs with return statements"