Last changes from Ubiquiti SDK