#FEC-2077 PodSpec optimizations