Merge branch 'isdn-constify-struct-class-usage'