JAL-3285 add unmerged features to AlignViewport