Incorporated the changes of the actual PR on the official branch

Merged Shounak Rangwala requested to merge fix/pr-changes-rails-6 into master

Merge request reports