Merge "Improvements in the Inliner."