merge 31.10.14