Bugfix/iss8884

lockLocation now precedes rectangle

I believe most of this is merged into release 6.1.1 already it would be good if this change could make the release