Merge branch 'daniel/controlif'