OPAL-1821 magma 1.6.2