Tagging as final sources for 3.1.5