Merged work done to v1.55 to dev