[BUGFIX] Fixed issue with footer tag [TASK] Code clean-up and improvement [RELEASE] Ready to release minor v12.0.7
