Merge "aoc: add policy to read system property" into main