Merge "Adding default False values instead of empty ones"