Bug 351713 - [refactoring] Change Function Signature broken. Cannot use at all. NPE is fixed Signed-off-by: vrubezhny <vrubezhny@exadel.com>