Merging TK-02268_Dashboard_Controller

This branch is rebased to S-01814