Merge "[WR] Initial commit with template for:"