Merge "Code cleaning for Index" into lmp-dev