[AS7-2213] PoC commit