Merge pull request #672 from spbnick/init_delay_rename_v3.0.x