Merging with newdev
Fixed merge conflicts
Merged onix-pl display changes