synched to latest widget development from OCRE