Updated to version 1.6.4-R0.2-STABLE