Merge branch '1198-complex-no-border' into 'devel_14.0.x'

import of complex with no border fixed

See merge request !1094
32 jobs for devel_14.0.x