Added changes to support 'staging' build.