Merge branch 'mk/qnx'