Merge "improve sdnc-web for external apps"