merged changes from zephyrm