Merge "Use CALLED_FROM_SETUP instead of KATI"