Merge branch 'l2x0' of rmk tree into prima2-l2x0