merging from 5.3.1