FALCON-2108 Fix licensing issues for Falcon release