Fixed recordsmanagement solution after merging 3 weeks of master commits