Fix for multiple requirements file conflict
Merge commits extracted from private repo