Merge "Late binding: track differences in RI behavior"