remaining part of static library commit, should have been a part of 16ce39c2309769789784a1f74e41ce0c49a75282