Merge remote-tracking branch 'develor/develop' into jordibgzashtita