Trac11776 m1

Design Review
(code not compile tested yet)