Complete with policy stroll concept support (26/41)

Complete with policy stroll concept support