change observables (Part 1)
change observables (Part 2)
change observables (Part 3)
Merge branch 'master' into cache
update cache