Merge changes from dymissy repo