Prepared Stage 3 version of 13027