sug-192 corrected caching when constraint removed
Merge branch '4.4'