Bug fix: #389794 - extracted existing code from action in the academic module to the correct one.