Merge "Remove dragonflow reference"