Applied allowEmpty to the updated original master