Fixed references and SF package version
Merge commit '03e4d9261c8718b779ca19244bd174153f224422' into HEAD