BZ-1001561 - Changes to data model not picked up
BZ-1041303 - Test scenario doesn't reflect changes in rules until the project is re-built

(cherry picked from commit 1bb4819cc73e3647ed4d98db4fd289817e832bde)