Merge with tb323 repository to get include file fixes