[#18363,#18513] Custom attributes modifications.