Rewrite random test
Merge branch '6.3.x' into 'BS-7318_MetadataPortal'