merged new changes in the develop branch into the path-x branch