BUG: Address window error on declaraction/definition mismatch

Change-Id: I298916e74683ea8680a6789543c8f2d116cbae4d
STYLE: Spacing between template and < removed

Change-Id: I9cfc07c6390b365318c6d1bb1bf2df3ed34d30d8
Merge topic 'FunctionDeclarationDefinitionMismatch'

9b25217 STYLE: Spacing between template and < removed
b15c280 BUG: Address window error on declaraction/definition mismatch