Port fix for file sec endpoint from develop