Fork of 1.3.17