FIX Some integration problems
MERGE with develop