Merge remote branch 'smcv/ready/glob-cache'