slightly cleaner slaves2indices

vasrequested to merge
(removed):pregmod-master into pregmod-master

A continuation of !1846 (merged) , see there for details.

Merge request reports