Applies detail in #55 to this list
Merge branch '55-policy-markers' into version-1.05