MAGMA-198

Implementation completed