Inital version with POC
Added test and configuration #5841