Merge branch 'mastofe/bundle-2020-01-20' into 'develop'