PLA-984/PLA-985 + some fixes
PLA-984 added test for dependent field
PLA-984 fix after merge