Merge pull request #1888 from Azaezel/updateEmpty