Merge branch 'daniel_ctrlif'