Merge "ngd_slim: Fix return paths in transfer function"