Merge "remove extra slash needed for index creation"