pulling in bug fixes for null content