Merge Demo app rewritten in develop