Merge "Fix policy" into amsterdam