Merge "Apex: updates for post-danube"