JAL-2346 JAL-1553 pull-up / push-down of fields and methods