Merge "Add required dependency to fix compilation"