I've raised FELIX-5243 about refactoring some SCR code but haven't had any feedback. The commits are visible at: https://github.com/gnodet/felix/commits/FELIX-5243 Unless someone complains, and given it's only refactoring and should not alter the code itself (and all tests pass), I'll push those changes later this week.
Cheers, Guillaume
