1.4.6.r05 commit for compatibility