Merge changes I007bc243,Ic6347639,Ic02c7f64 into main

* changes:
  Add cfg-blocklist config flag.
  Add helper method to set property to non-empty list.
  Sort more properties in output.