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