Version 1 of #3506