Merge recent changes

This is just a request to merge changes from a release branch into a standard develop branch, `develop-ifbyphone`.