merge nextalk 5.8