Ported app script changes from old repo to syscluster branch