CON-1016

*DO NOT MERGE*
Maybe we should first instead of one predefined?