merge from devel branch (1da6d12366fe7e62314f075178260e0c3226e104)