1.4 release refactor