[OE-3849] As this is an optional element, the layout columns will not be inherited from the form if the element is not active, thus we should specifiy the layout columns
Merge branch 'release/1.5' into develop