Yesterday
merge from S2P_bugfixes_for_quickfire