Merge pull request #2364 from tano-systems/split-status-page