Merge "Add new class for SetPropRule and move outside ShellCommandRule." into main