Version 3.3.9 changes