The random failure will be fixed by Bug#16263506 and this patch Approved by Marko. rb#1988
This bug is fixed by Bug#14251529. Only testcase from the contribution is used.