Merge https://github.com/rashidkpc/Kibana/pull/263