Merge "Yangman - precheck patharray, fix modal z-index and so on"