NX-620: Added TODO, no code change