EA-44879
EA-47013
EA-48713
EA-49004 + file clean up
bug in layered parser fixed; testdata fixed
Merge remote-tracking branch 'origin/master'