some tweaks
Merge remote-tracking branch 'upstream/ra-dev' into ra-dev