Merge "Fix legacy policy submit issues"