Merging RCAMP-compatibility back into master branch