Changes for COMMANDBOX-85.

https://ortussolutions.atlassian.net/browse/COMMANDBOX-85