merge devel at 26/08 to master