feature #2000: Include custom attributes in image creation form(cherry picked from commit 9b74e6c5bd2c6d6e972b0b9e6ac2123e01dfb5ea)