update for 10.2 after merging latest snapshot from blindside
wq