Merge "Verify arguments passed are non-null." into main