Merge branch 'release/1.5.2'
Merge tag '1.5.2' into develop

1.5.2 - fix remote tracking for features