Merge branch 'release/0.4.8'
Merge branch 'release/0.4.9'
Merge branch 'release/0.4.10'
Merge branch 'release/0.4.11'
corrected class name conflict from old copy/paste.
rp
Merge branch 'release/0.4.12'
Merge tag '0.4.12' into develop

Release 0.4.12