Add/fix SMF support for 2013Q3 and on