[FREELDR]: More local changes merging, part 2/x: