Fix for local cacheing
Merge remote-tracking branch 'origin/v1.1.2' into v1.1.2