Merge "idmap2: add signature policy"