Potential NG+ issue

@ezsh

Something may be up with it. Would you give transferring slaves for NG+ a test?

mentioned in merge request !4573 (merged)

closed via merge request !4573 (merged)

mentioned in commit e1ab5c3c

closed via commit 122d8f4c