merged v1.65-tweak-bfsync