Merge "(Control) Remove virtual inlines, better arrange source file & remove one...