Merge branch 'master', remote-tracking branch 'origin/irina'
Udapte planning
release version 6.2.5
Remove obsolete
Merge branch 'irina', remote-tracking branch 'origin/master' into irina