Merge "Fix for features - added missing dependency"