Merge pull request #245 from sauter-hq/custom-bar-data-gaps-459