KN-5922 Updated sample