bundle update on restart
caching and strong params fixes
merge