merged SenseiKiwi changes