Policy related comments on PR 172 addressed