Issue ID #12345 Modified by NTTS from develop