I would like to combine AVRO-1328 and AVRO-1330 into a single issue

[Vincenz Priesnitz]

I noticed that the issues AVRO-1328 and AVRO-1330 are very similar.
If nobody objects, i will combine them into a single follow up issue
tomorrow.