Bug-fix & merge from Subsonic 4.9 branch