Merge "use null rather then false and doc fix"