MANTA-17 fixing merge errors