Code

Aplied changes from revision 12395.