Initial commit. Based on v4.17