Revert "Revert "pt changes on content rules for setup""

This reverts commit 4345c342fa4836df1e3a1a426d05f8c8f6988207.