Changes: add changes for 0.26