AMQ4887 Changes