Merge "Remove null check from ForwardObject / ForwardCode"