Merge "Adding rules to preferences" into release/2019.2.0