Merge latest changes to Dashboard from L2FWD to L3FWD dashboard