Complete with policy stroll concept support (20/41)

Complete with policy stroll concept support