Complete with policy stroll concept support (16/41)

Complete with policy stroll concept support