merge xav -> default
Fix the able message in the PN-View