Merge branch 'topic/updateDesignForTBS3.x' into develop