Merge branch '317943-replace-spring-dm-with-gemini-blueprint'