Merge "DO NOT MERGE Update active unlock triggers take #2" into tm-dev