Merge pull request #3517 from Ansuel/ubus_short