Merge branches 'feature/getboolean-improvements' and 'feature/image-ashtml-improvements' into patched