merged development changes in for release as v1.5507