Letting this go to master for composer