Merge "Yangman - change loader"