Migrate to new features of framework
Merge remote-tracking branch 'origin/master'
Code clean up