Do you think it can be merged in oacs-4-6 as well? After all we want to get rid of all the bugs in there before releasing it ...