Reviewed-by: mseledtsov, dholmes
Reviewed-by: hseigel
Add missing file from original commit Reviewed-by: shade, sgehwolf