separate group
Remove workaround code for Zephyr
v1.2.2