Fixes #521: adding application custom stuff support without branching for debug and deploy