merge of 'daniel/controlif' branch