YH-228: Included missing file from last commit