Fix view paths cache
Merge branch 'ActionItem2905' into stable