Implementing core fc4j 2.0 functionality

[#80392902]
Oh ok, redacted - was just behind you on my post