Merged work done on v1.54 to development