#11971 & #5723 WIP