Windriver did something (should be in last commit