201318 bugfixes integration