Added canvas fallback data
auto-merge staging into master