Added changes from ]project-open[