Started work on aes as well [Ticket #6877]