Addressing appsdir review by Alexey.