It seemed like template is referring to the changes from block class. Block class is not included in this pull request. Please add the block class changes in this pull request.