Fix customer tagging bug
Merge branch 'release/1.3.3'