Implement SM_ALLOW_CACHE_RESET flag to reset the cache on error from model change
Merge branch 'development' into f/reset_cache_flag
Merge branch 'f/reset_cache_flag' into development