FS RT #884 - merge from master to FREESIDE_3_BRANCH