8.0 wmsstaging5 jco

Bug fixes from support and github