KF-102 - Issue fixed. No rest implementation though