Added placeholder for #814 and flagged that #815 is done