Merge branch 'ib-move-htc-egpio' into devel