Luke's only on-screen lightsaber training was given by Obi-Wan Kenobi during the hyperspace jump to the Alderaan system.
Did Luke receive further lightsaber training prior to the final battle on the Death Star II? If yes, how did he receive these training?
Seeking answers for Disney canon as well as the Legends EU canon.