Update up to changes in deferred package
Update up to changes in deferred package
Fix clear order in castAttribute