Final work on FREEPBX-5332