Merge branch 'topic/rename_interface'
Workaround for platforms w/o POLLPRI
Merge branch 'topic/POLLPRI_workaround' into develop