merging recent rocket platform bug fixes back to standalone.