merge from dev. branch v2.5