[858813] make sure the previous fix is applied to all applicab;e component classes