Mantis:S issues/nn

SAKER