Firmware #3.36 Bugfix