BZ-12884 units selection