ported to PM 2
Merge remote-tracking branch 'origin/master_port_12_12' into master_port_12_12