BK-1186 Implement History tab
Fix Merge Conflict with branch '2.0'