merge updates from Ww2.5.1.3 into devel