Feature/backtothegrid2

Bug fix: [no]
Feature addition: [yes]
Backwards compatibility break: [no]
Unit test passes: [yes]
Behat scenarios passes: [yes]
Checkstyle issues: [no]
Documentation PR: [link to the documentation PR if there is one]
Fixes the following jira: