resolved merge conflicts of jsipula -> unstable