Merge "modules, v23tests: Security usability improvement"