Initial commit. Based on v3.18