[DF-5048] moving controls from library