Fixed associations tests
improving search
Merge remote-tracking branch 'origin/2-3-stable' into 2-4-stable