Merge tag '0.2.47' into develop

release 0.2.47
do not save to session if not active
rp
Merge branch 'release/0.2.48'