Merge remote branch 'koha-fbc/k_bug_5249' into to-push