Merge branch 'amenadiel-apcu' into apcu
Fixed some merge issues
Fixed some merge issues