Complete with policy stroll concept support (40/41)

Complete with policy stroll concept support