Zebra - Improved documentation - Fix #4777 and #4778