reintegrate development to trunk (11578)
 reintegrate development to trunk (11578)