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