Additions for 1.1.17