K3.0 Strapless update
Merge pull request #1449 from 810/master

k3.0 Strapless update