Updated changelog
Adjusted #2008
Removed unused import
Advanced application template typo fix
Merge pull request #2104 from marianzburlea/master

Advanced application template typo fix
refacotring.