[FREELDR]: Gently merge my local changes, part 1/x: