adjusted solution in temporary branch
Merge remote-tracking branch 'origin/Temporary-(bloom)'