[ALOY-440] Dynamic picker fix, PR for 1_5_X branch