NiNeSoL-3947

NiNeSoL-3947