Regression(merge) from last commit

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Fix windows template compile regression.

Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>