Merge ninja-zigbee's changes

Merge all changes from original repo