Merged changes from @KISS-Web-Design & disabled task during external redirect