Adapted pending actions to the last refactorization.
Merge branch 'phones'