Merge "Fixed JIRA N_SE-51367 in HEADER & Footer. Signed-off-by: moinuddin.s <moinuddi...