* Initial commit for new feature. * Fixes. * Final fixes. * Fix merge issue. * A few last fixes. * Compiler fix.