more changes to merge with meta-ros repo