Yes, this includes the end of Ashley Thomas's dementia storyline.
From Ashley Thomas's disappearing act, to Aaron Dingle's prison troubles.