Merge "Remove old pipeline caches" into devel/master